bitkeeper revision 1.22.2.1 (3e428abeBVF1J00dtGMWKqQjaRgvkA)

mm.h, memory.c:
  Fix compiler warning.

diff --git a/xen-2.4.16/common/memory.c b/xen-2.4.16/common/memory.c
index 1ac70b43a9f9b4d72866b6bb537f88f6c7ebfbc1..d5f524c2e43866ca384d0f201dbc08d6470c9309 100644 (file)
--- a/xen-2.4.16/common/memory.c
+++ b/xen-2.4.16/common/memory.c
@@ -227,17 +227,17 @@ void __init init_frametable(unsigned long nr_pages)
     frame_table = (frame_table_t *)FRAMETABLE_VIRT_START;
     memset(frame_table, 0, frame_table_size);
 
-    free_pfns = nr_pages - 
-        ((__pa(frame_table) + frame_table_size) >> PAGE_SHIFT);
+    free_pfns = 0;
 
     /* Put all domain-allocatable memory on a free list. */
     INIT_LIST_HEAD(&free_list);
-    for( page_index = (__pa(frame_table) + frame_table_size) >> PAGE_SHIFT; 
-         page_index < nr_pages; 
-         page_index++ )      
+    for( page_index = nr_pages - 1;
+         page_index >= (__pa(frame_table) + frame_table_size) >> PAGE_SHIFT; 
+         page_index -= 2 )      
     {
         pf = list_entry(&frame_table[page_index].list, struct pfn_info, list);
         list_add_tail(&pf->list, &free_list);
+        free_pfns++;
     }
 }
 

diff --git a/xen-2.4.16/include/xeno/mm.h b/xen-2.4.16/include/xeno/mm.h
index e99d8e68896498f7ccb434ad0c10a82f869ef397..ec85a0a7f90b08315ad95745c5122df2f6c350b7 100644 (file)
--- a/xen-2.4.16/include/xeno/mm.h
+++ b/xen-2.4.16/include/xeno/mm.h
@@ -118,6 +118,7 @@ void init_frametable(unsigned long nr_pages);
  * will use it to store a "physical" frame number to give the appearance of
  * contiguous (or near contiguous) physical memory.
  */
+#undef  machine_to_phys_mapping
 #define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START)
 
 /* Part of the domain API. */